From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 29 Mar 2009 17:12:26 +0000 (+0000)
Subject: Conditionalize prototyping and use of ftfont_variation_glyphs.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1041
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=330956ea8277b92442f1fefded6c42338fc969f0;p=emacs.git

Conditionalize prototyping and use of ftfont_variation_glyphs.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index b8c39cd920d..33fb9b455a6 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -381,8 +381,15 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
 				    int *, int *));
 static Lisp_Object ftfont_otf_capability P_ ((struct font *));
 static Lisp_Object ftfont_shape P_ ((Lisp_Object));
+
+#ifdef HAVE_LIBOTF
+#ifdef HAVE_M17N_FLT
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
 static int ftfont_variation_glyphs P_ ((struct font *, int c,
 					unsigned variations[256]));
+#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
+#endif /* HAVE_M17N_FLT */
+#endif /* HAVE_LIBOTF */
 
 struct font_driver ftfont_driver =
   {
@@ -422,7 +429,8 @@ struct font_driver ftfont_driver =
     NULL,
 #endif	/* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
     NULL,			/* check */
-#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
+
+#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS)
     ftfont_variation_glyphs
 #else
     NULL